Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Fri, 26 Aug 2011 16:13:07 +0000 (09:13 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Fri, 26 Aug 2011 16:13:07 +0000 (09:13 -0700)
commit79802ce1f090609cab39e8f6dea2eec67e26bf56
treeac791d9f2611a9d642ff6dd4cec9c0ddcbb7ea9c
parent35e4c2ef1352758d2e561441077af8b1047ce2db
parent4cb557fa4b4d46179af0f75e4b8c09454dc7437d
Merge from trunk.
src/ChangeLog
src/xdisp.c